Don't crash when load-path elements are nil

Add 0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch to make
the relevant changes.

Thanks to Balint Reczey for the 24.4+1-4.1 NMU which included this
fix.

Closes: 768751

diff --cc debian/.git-dpm
index c9c45df3e6d21091970fadd05195cbdac9344150,0000000000000000000000000000000000000000..f49c2401c142bf7e844b67b2ead66bff56f5226b
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- ab7f768c51efc79f100d01ce4f3d6c5bad12be32
- ab7f768c51efc79f100d01ce4f3d6c5bad12be32
 +# see git-dpm(1) from git-dpm package
++be3e084c88ddd5292f485fd59216d016fec6ba99
++be3e084c88ddd5292f485fd59216d016fec6ba99
 +fa54b24bfb46d6799598ccd7639c5ad7c02df252
 +fa54b24bfb46d6799598ccd7639c5ad7c02df252
 +emacs24_24.4+1.orig.tar.bz2
 +b73323c62f01f42ddf6c57eada1a4f58cf0806e1
 +24395968

diff --cc debian/patches/0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c92392201467c277811c72ac2f8fb21f30309fcb
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
@@@ -1,0 -1,0 +1,41 @@@
++From be3e084c88ddd5292f485fd59216d016fec6ba99 Mon Sep 17 00:00:00 2001
++From: Glenn Morris <rgm@gnu.org>
++Date: Sun, 9 Nov 2014 23:12:37 -0800
++Subject: Nil load-path elements shouldn't crash Emacs
++
++This upstream patches has been added:
++
++  * lisp/startup.el (command-line): Handle nil elements in load-path.
++
++Origin: upstream, http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=edfdb22f674312389ccf5d5e37efa4d3f1516994
++Bug-Debian: http://bugs/debian.org/768751
++Added-by: Rob Browning <rlb@defaultvalue.org>
++---
++ lisp/ChangeLog  | 4 ++++
++ lisp/startup.el | 1 +
++ 2 files changed, 5 insertions(+)
++
++diff --git a/lisp/ChangeLog b/lisp/ChangeLog
++index 781b3ab..b162ebc 100644
++--- a/lisp/ChangeLog
+++++ b/lisp/ChangeLog
++@@ -1,3 +1,7 @@
+++2014-11-10  Glenn Morris  <rgm@gnu.org>
+++
+++     * startup.el (command-line): Handle nil elements in load-path.
+++
++ 2014-10-20  Glenn Morris  <rgm@gnu.org>
++ 
++      * Version 24.4 released.
++diff --git a/lisp/startup.el b/lisp/startup.el
++index c4f9f79..1ef2556 100644
++--- a/lisp/startup.el
+++++ b/lisp/startup.el
++@@ -1336,6 +1336,7 @@ the `--debug-init' option to view a complete error backtrace."
++   (let (warned)
++     (dolist (dir load-path)
++       (and (not warned)
+++        (stringp dir)
++         (string-match-p "/[._]emacs\\.d/?\\'" dir)
++         (string-equal (file-name-as-directory (expand-file-name dir))
++                       (expand-file-name user-emacs-directory))

diff --cc debian/patches/series
index 1efaa1e7f23a55f0d24b157d4d954ba979c819f1,0000000000000000000000000000000000000000..67ebb2a1be1b31d7d7c43ee6f245a7e8f013e3ef
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0008-A-race-to-create-info-has-been-eliminated.patch
++0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch